From 0d48b7db6956f1d5c9d5b312b5064e3c773abcb9 Mon Sep 17 00:00:00 2001 From: "mjw@wray-m-3.hpl.hp.com" Date: Thu, 29 Jul 2004 14:50:48 +0000 Subject: [PATCH] bitkeeper revision 1.1108.35.4 (41090ec8uR9vt6nVJD7Yw0OJlfO1Hw) Rename the xm defaults for linux and netbsd, replace with a simpler default config that doesn't use parameters. --- .rootkeys | 5 +- tools/examples/xmdefaults | 40 ++---- tools/examples/xmexample | 120 ++++++++++++++++++ tools/examples/{xmnetbsd => xmnetbsd-example} | 40 ++++-- 4 files changed, 165 insertions(+), 40 deletions(-) create mode 100644 tools/examples/xmexample rename tools/examples/{xmnetbsd => xmnetbsd-example} (69%) diff --git a/.rootkeys b/.rootkeys index 057be97bd7..27d567caac 100644 --- a/.rootkeys +++ b/.rootkeys @@ -266,8 +266,9 @@ 40ee75a967sxgcRY4Q7zXoVUaJ4flA tools/examples/vif-bridge 40e15b7edWEtBf_oe3eBwGKuh1dyzQ tools/examples/vifctl 40ee75a93cqxHp6MiYXxxwR5j2_8QQ tools/examples/xend-config.sxp -40cf2937oKlROYOJTN8GWwWM5AmjBg tools/examples/xmdefaults -40dfd40auJwNnb8NoiSnRkvZaaXkUg tools/examples/xmnetbsd +41090ec8Pj_bkgCBpg2W7WfmNkumEA tools/examples/xmdefaults +40cf2937oKlROYOJTN8GWwWM5AmjBg tools/examples/xmexample +40dfd40auJwNnb8NoiSnRkvZaaXkUg tools/examples/xmnetbsd-example 3fbba6dbDfYvJSsw9500b4SZyUhxjQ tools/libxc/Makefile 3fbba6dc1uU7U3IFeF6A-XEOYF2MkQ tools/libxc/rpm.spec 3fbba6dcrNxtygEcgJYAJJ1gCQqfsA tools/libxc/xc.h diff --git a/tools/examples/xmdefaults b/tools/examples/xmdefaults index ebb894d53e..0b7c5b2230 100644 --- a/tools/examples/xmdefaults +++ b/tools/examples/xmdefaults @@ -1,28 +1,14 @@ # -*- mode: python; -*- #============================================================================ # Python defaults setup for 'xm create'. -# Edit this file to reflect the configuration of your system. +# This script sets the parameters used when a domain is created using 'xm create'. +# You use a separate script for each domain you want to create, or +# you can set the parameters for the domain on the xm command line. #============================================================================ -# Define script variables here. -# xm_vars is defined automatically, use xm_vars.var() to define a variable. - -def vmid_check(var, val): - val = int(val) - if val <= 0: - raise ValueError - return val - -xm_vars.var('vmid', - use="Virtual machine id. Integer greater than 0.", - check=vmid_check) - -# This checks the script variables. -xm_vars.check() - #---------------------------------------------------------------------------- # Kernel image file. -kernel = "../../../install/boot/vmlinuz-2.4.26-xenU" +kernel = "/boot/vmlinuz-2.4.26-xenU" # Optional ramdisk. #ramdisk = "/boot/initrd.gz" @@ -34,12 +20,11 @@ kernel = "../../../install/boot/vmlinuz-2.4.26-xenU" # Initial memory allocation (in megabytes) for the new domain. memory = 64 -# A handy name for your new domain. -name = "This is VM %d" % vmid +# A name for your domain. All domains must have different names. +name = "ExampleDomain" # Which CPU to start domain on? #cpu = -1 # leave to Xen to pick -cpu = vmid # set based on vmid (mod number of CPUs) #---------------------------------------------------------------------------- # Define network interfaces. @@ -54,12 +39,11 @@ cpu = vmid # set based on vmid (mod number of CPUs) #---------------------------------------------------------------------------- # Define the disk devices you want the domain to have access to, and # what you want them accessible as. -# Each disk entry is of the form phy:DEV,VDEV,MODE -# where DEV is the device, VDEV is the device name the domain will see, +# Each disk entry is of the form phy:UNAME,DEV,MODE +# where UNAME is the device, DEV is the device name the domain will see, # and MODE is r for read-only, w for read-write. -disk = [ 'phy:sda%d,sda1,w' % (7+vmid), - 'phy:sda6,sda6,r' ] +disk = [ 'phy:hda1,xda1,r' ] #---------------------------------------------------------------------------- # Set the kernel command line for the new domain. @@ -78,7 +62,7 @@ disk = [ 'phy:sda%d,sda1,w' % (7+vmid), #hostname= "vm%d" % vmid # Set root device. -root = "/dev/sda1 ro" +root = "/dev/xda1 ro" # Root device for nfs. #root = "/dev/nfs" @@ -87,8 +71,8 @@ root = "/dev/sda1 ro" # Root directory on the nfs server. #nfs_root = '/full/path/to/root/directory' -# Sets runlevel 4 and the device for /usr. -extra = "4 VMID=%d usr=/dev/sda6" % vmid +# Sets runlevel 4. +extra = "4" #---------------------------------------------------------------------------- # Set according to whether you want the domain restarted when it exits. diff --git a/tools/examples/xmexample b/tools/examples/xmexample new file mode 100644 index 0000000000..d6df731c45 --- /dev/null +++ b/tools/examples/xmexample @@ -0,0 +1,120 @@ +# -*- mode: python; -*- +#============================================================================ +# Example Python setup script for 'xm create'. +# This script sets the parameters used when a domain is created using 'xm create'. +# +# This is a relatively advanced script that uses a parameter, vmid, to control +# the settings. So this script can be used to start a set of domains by +# setting the vmid parameter on the 'xm create' command line. For example: +# +# xm create vmid=1 +# xm create vmid=2 +# xm create vmid=3 +# +# The vmid is purely a script variable, and has no effect on the the domain +# id assigned to the new domain. +#============================================================================ + +# Define script variables here. +# xm_vars is defined automatically, use xm_vars.var() to define a variable. + +# This function checks that 'vmid' has been given a valid value. +# It is called automatically by 'xm create'. +def vmid_check(var, val): + val = int(val) + if val <= 0: + raise ValueError + return val + +# Define the 'vmid' variable so that 'xm create' knows about it. +xm_vars.var('vmid', + use="Virtual machine id. Integer greater than 0.", + check=vmid_check) + +# Check the defined variables have valid values.. +xm_vars.check() + +#---------------------------------------------------------------------------- +# Kernel image file. +kernel = "/boot/vmlinuz-2.4.26-xenU" + +# Optional ramdisk. +#ramdisk = "/boot/initrd.gz" + +# The domain build function. Default is 'linux'. +#builder='linux' +#builder='netbsd' + +# Initial memory allocation (in megabytes) for the new domain. +memory = 64 + +# A name for the new domain. All domains have to have different names, +# so we use the vmid to create a name. +name = "VM%d" % vmid + +# Which CPU to start domain on? +#cpu = -1 # leave to Xen to pick +cpu = vmid # set based on vmid (mod number of CPUs) + +#---------------------------------------------------------------------------- +# Define network interfaces. + +# Number of network interfaces. Default is 1. +#nics=1 + +# Optionally define mac and/or bridge for the network interfaces. +# Random MACs are assigned if not given. +#vif = [ 'mac=aa:00:00:00:00:11, bridge=xen-br0' ] + +#---------------------------------------------------------------------------- +# Define the disk devices you want the domain to have access to, and +# what you want them accessible as. +# Each disk entry is of the form phy:UNAME,DEV,MODE +# where UNAME is the device, DEV is the device name the domain will see, +# and MODE is r for read-only, w for read-write. + +# This makes the disk device depend on the vmid - assuming +# that devices sda7, sda8 etc. exist. The device is exported +# to all domains as sda1. +# All domains get sda6 read-only (to use for /usr, see below). +disk = [ 'phy:sda%d,sda1,w' % (7+vmid), + 'phy:sda6,sda6,r' ] + +#---------------------------------------------------------------------------- +# Set the kernel command line for the new domain. +# You only need to define the IP parameters and hostname if the domain's +# IP config doesn't, e.g. in ifcfg-eth0 or via DHCP. +# You can use 'extra' to set the runlevel and custom environment +# variables used by custom rc scripts (e.g. VMID=, usr= ). + +# Set if you want dhcp to allocate the IP address. +#dhcp="dhcp" +# Set netmask. +#netmask= +# Set default gateway. +#gateway= +# Set the hostname. +#hostname= "vm%d" % vmid + +# Set root device. +root = "/dev/sda1 ro" + +# Root device for nfs. +#root = "/dev/nfs" +# The nfs server. +#nfs_server = '169.254.1.0' +# Root directory on the nfs server. +#nfs_root = '/full/path/to/root/directory' + +# Sets runlevel 4 and the device for /usr. +extra = "4 VMID=%d usr=/dev/sda6" % vmid + +#---------------------------------------------------------------------------- +# Set according to whether you want the domain restarted when it exits. +# The default is 'onreboot', which restarts the domain when it shuts down +# with exit code reboot. +# Other values are 'always', and 'never'. + +#restart = 'onreboot' + +#============================================================================ diff --git a/tools/examples/xmnetbsd b/tools/examples/xmnetbsd-example similarity index 69% rename from tools/examples/xmnetbsd rename to tools/examples/xmnetbsd-example index f2a525d2e9..8d1662483a 100644 --- a/tools/examples/xmnetbsd +++ b/tools/examples/xmnetbsd-example @@ -1,23 +1,37 @@ # -*- mode: python; -*- #============================================================================ -# Python defaults setup for 'xm create'. -# Edit this file to reflect the configuration of your system. +# Example Python setup script for 'xm create'. +# This script sets the parameters used when a domain is created using 'xm create'. +# +# This is a relatively advanced script that uses a parameter, vmid, to control +# the settings. So this script can be used to start a set of domains by +# setting the vmid parameter on the 'xm create' command line. For example: +# +# xm create vmid=1 +# xm create vmid=2 +# xm create vmid=3 +# +# The vmid is purely a script variable, and has no effect on the the domain +# id assigned to the new domain. #============================================================================ # Define script variables here. # xm_vars is defined automatically, use xm_vars.var() to define a variable. +# This function checks that 'vmid' has been given a valid value. +# It is called automatically by 'xm create'. def vmid_check(var, val): val = int(val) if val <= 0: raise ValueError return val - + +# Define the 'vmid' variable so that 'xm create' knows about it. xm_vars.var('vmid', use="Virtual machine id. Integer greater than 0.", check=vmid_check) -# This checks the script variables. +# Check the defined variables have valid values.. xm_vars.check() #---------------------------------------------------------------------------- @@ -30,8 +44,9 @@ builder='netbsd' # Initial memory allocation (in megabytes) for the new domain. memory = 16 -# A handy name for your new domain. -name = "NetBSD VM %d" % vmid +# A name for the new domain. All domains have to have different names, +# so we use the vmid to create a name. +name = "NETBSD%d" % vmid #---------------------------------------------------------------------------- # Define network interfaces. @@ -55,12 +70,16 @@ name = "NetBSD VM %d" % vmid #---------------------------------------------------------------------------- # Define the disk devices you want the domain to have access to, and # what you want them accessible as. -# Each disk entry is of the form phy:DEV,VDEV,MODE -# where DEV is the device, VDEV is the device name the domain will see, +# Each disk entry is of the form phy:UNAME,DEV,MODE +# where UNAME is the device, DEV is the device name the domain will see, # and MODE is r for read-only, w for read-write. -#disk = [ 'phy:sda%d,sda1,w' % (7+vmid), -# 'phy:sda6,sda6,r' ] +# This makes the disk device depend on the vmid - assuming +# that devices sda7, sda8 etc. exist. The device is exported +# to all domains as sda1. +# All domains get sda6 read-only (to use for /usr, see below). +disk = [ 'phy:sda%d,sda1,w' % (7+vmid), + 'phy:sda6,sda6,r' ] #---------------------------------------------------------------------------- # Set the kernel command line for the new domain. @@ -100,4 +119,5 @@ extra = "4 VMID=%d bootdev=xennet0" % vmid # Other values are 'always', and 'never'. # #restart = 'onreboot' + #============================================================================ -- 2.30.2